From 37ba057128677a9d9b760622613f918941e3b028 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 2 Jul 2021 02:33:18 +0200 Subject: [PATCH] x11: Do not call glXQueryExtension() epoxy does that already. --- gdk/x11/gdkdisplay-x11.h | 2 -- gdk/x11/gdkglcontext-glx.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h index 9960bc8e60..067f34cca8 100644 --- a/gdk/x11/gdkdisplay-x11.h +++ b/gdk/x11/gdkdisplay-x11.h @@ -132,8 +132,6 @@ struct _GdkX11Display /* GLX information */ /* GLXFBConfig */ gpointer glx_config; int glx_version; - int glx_error_base; - int glx_event_base; /* EGL information */ /* We use gpointer here so we don't have to pull in EGL headers (which glx doesn't like) */ diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c index 7eae1958e0..9b112053f7 100644 --- a/gdk/x11/gdkglcontext-glx.c +++ b/gdk/x11/gdkglcontext-glx.c @@ -956,7 +956,6 @@ gdk_x11_display_init_glx (GdkX11Display *display_x11, { GdkDisplay *display = GDK_DISPLAY (display_x11); Display *dpy; - int error_base, event_base; int screen_num; dpy = gdk_x11_display_get_xdisplay (display); @@ -964,14 +963,9 @@ gdk_x11_display_init_glx (GdkX11Display *display_x11, if (!epoxy_has_glx (dpy)) return FALSE; - if (!glXQueryExtension (dpy, &error_base, &event_base)) - return FALSE; - screen_num = display_x11->screen->screen_num; display_x11->glx_version = epoxy_glx_version (dpy, screen_num); - display_x11->glx_error_base = error_base; - display_x11->glx_event_base = event_base; display_x11->has_glx_create_context = epoxy_has_glx_extension (dpy, screen_num, "GLX_ARB_create_context_profile"); -- 2.30.2